Olaf update reference files for GDB and BCR. Fix README for BCR.

diff --git a/gpsbabel/README b/gpsbabel/README
index 71dfa7186c70011fd70dca840fcf49eae5c89f4c..fda4476515e34ca2bba2a2e0f56a9049dffced57 100644 (file)
--- a/gpsbabel/README
+++ b/gpsbabel/README
@@ -885,9 +885,9 @@ THE FORMATS
        An example with all options:
        
        gpsbabel -r \
-                -i bcr,index=1,name="From A to B",radius=6371012 \
-                -f a_to_b.bcr \
-                -o gpx -F out.gpx
+                -i gpx -f in.gpx
+                -o bcr,index=1,name="From A to B",radius=6371012 \
+                -F a_to_b.bcr
          
 
 DATA FILTERS

diff --git a/gpsbabel/reference/gdb-sample.gpx b/gpsbabel/reference/gdb-sample.gpx
index 3f080374b4ed1be14e836f99dce098331a7fe466..06e1f726be133a8c5495c6b87aa2495ff15eed11 100644 (file)
--- a/gpsbabel/reference/gdb-sample.gpx
+++ b/gpsbabel/reference/gdb-sample.gpx
@@ -5,7 +5,7 @@ creator="GPSBabel - http://www.gpsbabel.org"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns="http://www.topografix.com/GPX/1/0"
 xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
-<time>2005-06-28T15:26:12Z</time>
+<time>1970-01-01T00:00:00Z</time>
 <bounds minlat="50.492618987" minlon ="12.105448823" maxlat="51.314520836" maxlon="12.435919438" />
 <wpt lat="50.877340632" lon="12.433888670">
   <name>3</name>
@@ -94,6 +94,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
 <time>2005-02-26T09:03:15Z</time>
     <name>Liebknechtstras</name>
     <cmt>Liebknechtstrasse 90</cmt>
+    <desc>Liebknechtstrasse 90</desc>
     <sym>Golf Course</sym>
   </rtept>
   <rtept lat="50.493836962" lon="12.106101271">
@@ -109,6 +110,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
 <time>2005-02-26T09:02:20Z</time>
     <name>Jahnstrasse11</name>
     <cmt>Jahnstrasse 11</cmt>
+    <desc>Jahnstrasse 11</desc>
     <sym>Golf Course</sym>
   </rtept>
   <rtept lat="50.493662786" lon="12.107152529">
@@ -223,6 +225,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
 <time>2005-02-26T08:59:59Z</time>
     <name>Elsterberg</name>
     <cmt>Piehlerstrasse</cmt>
+    <desc>Piehlerstrasse</desc>
     <sym>Golf Course</sym>
   </rtept>
   <rtept lat="50.610795189" lon="12.173802238">
@@ -286,6 +289,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
 <time>2005-02-26T08:57:04Z</time>
     <name>Greiz</name>
     <cmt>August-Bebel-Strasse</cmt>
+    <desc>August-Bebel-Strasse</desc>
     <sym>Golf Course</sym>
   </rtept>
   <rtept lat="50.654762965" lon="12.204956934">
@@ -430,6 +434,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
 <time>2005-02-26T09:10:47Z</time>
     <name>Gosel</name>
     <cmt>Gosel</cmt>
+    <desc>Gosel</desc>
     <sym>Golf Course</sym>
   </rtept>
   <rtept lat="50.844125664" lon="12.408756875">
@@ -465,6 +470,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <rtept lat="50.877340632" lon="12.433888670">
     <name>3</name>
     <cmt>B93</cmt>
+    <desc>B93</desc>
     <sym>Waypoint</sym>
   </rtept>
   <rtept lat="50.877340548" lon="12.433888670">

diff --git a/gpsbabel/reference/route/bcr-sample.gpx b/gpsbabel/reference/route/bcr-sample.gpx
index 19b1105c7e97f3aa19cc0f8c13c9a83ca50b38bd..eb4d8b21e22f6361a7b2849714544bef7239d1f1 100644 (file)
--- a/gpsbabel/reference/route/bcr-sample.gpx
+++ b/gpsbabel/reference/route/bcr-sample.gpx
@@ -66,46 +66,55 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <rtept lat="50.492706401" lon="12.105471361">
     <name>STATION1</name>
     <cmt>bei D 08527,Neundorf,,0,</cmt>
+    <desc>bei D 08527,Neundorf,,0,</desc>
     <sym>Waypoint</sym>
   </rtept>
   <rtept lat="50.494102371" lon="12.107252018">
     <name>STATION2</name>
     <cmt>bei D 08523,Plauen/Possig,,0,</cmt>
+    <desc>bei D 08523,Plauen/Possig,,0,</desc>
     <sym>Waypoint</sym>
   </rtept>
   <rtept lat="50.497986840" lon="12.105885049">
     <name>STATION3</name>
     <cmt>bei D 08523,Plauen/Westend,,0,</cmt>
+    <desc>bei D 08523,Plauen/Westend,,0,</desc>
     <sym>Waypoint</sym>
   </rtept>
   <rtept lat="50.688914683" lon="12.327792655">
     <name>STATION4</name>
     <cmt>bei D 08427,Fraureuth/Beiersdorf,,0,</cmt>
+    <desc>bei D 08427,Fraureuth/Beiersdorf,,0,</desc>
     <sym>Waypoint</sym>
   </rtept>
   <rtept lat="50.864403822" lon="12.429074255">
     <name>STATION5</name>
     <cmt>bei D 04639,Ponitz/Merlach,,0,</cmt>
+    <desc>bei D 04639,Ponitz/Merlach,,0,</desc>
     <sym>Waypoint</sym>
   </rtept>
   <rtept lat="50.971321599" lon="12.452645474">
     <name>STATION6</name>
     <cmt>bei D 04600,Altenburg/Paditz,,0,</cmt>
+    <desc>bei D 04600,Altenburg/Paditz,,0,</desc>
     <sym>Waypoint</sym>
   </rtept>
   <rtept lat="51.171165953" lon="12.492485421">
     <name>STATION7</name>
     <cmt>bei D 04552,Borna/Gestewitz,,0,</cmt>
+    <desc>bei D 04552,Borna/Gestewitz,,0,</desc>
     <sym>Waypoint</sym>
   </rtept>
   <rtept lat="51.238200898" lon="12.388856592">
     <name>STATION8</name>
     <cmt>bei D 04564,Boehlen/Grossdeuben,,0,</cmt>
+    <desc>bei D 04564,Boehlen/Grossdeuben,,0,</desc>
     <sym>Waypoint</sym>
   </rtept>
   <rtept lat="51.314684001" lon="12.409118308">
     <name>STATION9</name>
     <cmt>bei D 04317,Leipzig/Thonberg,,0,</cmt>
+    <desc>bei D 04317,Leipzig/Thonberg,,0,</desc>
     <sym>Waypoint</sym>
   </rtept>
 </rte>

diff --git a/gpsbabel/testo b/gpsbabel/testo
index 37cd846216b9971496e3a81d8a3dba327ee91b2f..dede59b066ac33f413d1ef071d3ccc6cdf1398dc 100755 (executable)
--- a/gpsbabel/testo
+++ b/gpsbabel/testo
@@ -716,10 +716,12 @@ rm -f ${TMPDIR}/pathaway*
 ${PNAME} -t -i pathaway -f reference/track/pathaway.pdb -o gpx -F ${TMPDIR}/pathaway.gpx
 compare ${TMPDIR}/pathaway.gpx reference/track/pathaway.gpx
 
-${PNAME} -w -r -t -i gdb -f reference/gdb-sample.gdb -x track,pack -o gpx -F ${TMPDIR}/gdb-sample.gpx
-grep -v "<time>" reference/gdb-sample.gpx > ${TMPDIR}/gdb-sample.ref
-grep -v "<time>" ${TMPDIR}/gdb-sample.gpx > ${TMPDIR}/gdb-sample.new
-compare ${TMPDIR}/gdb-sample.ref ${TMPDIR}/gdb-sample.new
+#
+# Garmin GPS Database .gdb read test
+#
+rm -f ${TMPDIR}/gdb-*
+${PNAME} -w -r -t -i gdb -f reference/gdb-sample.gdb -o gpx -F ${TMPDIR}/gdb-sample.gpx
+compare reference/gdb-sample.gpx ${TMPDIR}/gdb-sample.gpx
 
 #
 # Vito Navigator II .smt tests